Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove duplicate span from FunctionReturnType #2546

Merged

Conversation

alexvitkov
Copy link
Contributor

@alexvitkov alexvitkov commented Sep 4, 2023

Description

Problem*

We have a struct called FunctionReturnType, that has a UnresolvedType and a Span. Recently we added a Span to UnresolvedType itself, so the Span is no longer needed

Summary*

Documentation

  • This PR requires documentation updates when merged.

    • I will submit a noir-lang/docs PR.
    • I will request for and support Dev Rel's help in documenting this PR.

Additional Context

PR Checklist*

  • I have tested the changes locally.
  • I have formatted the changes with Prettier and/or cargo fmt on default settings.

@alexvitkov alexvitkov changed the title refactor: remove FunctionReturnType struct, as UnresolvedType now has a Span chore: remove FunctionReturnType struct, as UnresolvedType now has a Span Sep 4, 2023
@ghost
Copy link

ghost commented Sep 4, 2023

The default variant of the enum was needed in order not to display help in such cases; I guess it would be confusing, not sure.

error: expected type (), found type Field
  ┌─ main.nr:1:14
  │
1 │ fn test() -> () {
  │              -- expected () because of return type
2 │     42
  │     -- Field returned here
  │
  = help: try adding a return type: `-> Field`

@alexvitkov alexvitkov force-pushed the remove-function-return-type branch from 30e1338 to 1545441 Compare September 4, 2023 12:44
@alexvitkov
Copy link
Contributor Author

alexvitkov commented Sep 4, 2023

Ah ok, makes sense -- I thought it was just for the Span. In that case I'll bring back the struct and just remove span, since we're storing it twice in the struct.

@alexvitkov alexvitkov changed the title chore: remove FunctionReturnType struct, as UnresolvedType now has a Span chore: remove duplicate span from FunctionReturnType Sep 4, 2023
Copy link
Contributor

@jfecher jfecher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@jfecher jfecher added this pull request to the merge queue Sep 5, 2023
Merged via the queue into noir-lang:master with commit f7dc943 Sep 5, 2023
TomAFrench added a commit that referenced this pull request Sep 5, 2023
* master:
  chore: Replace hashers of hashmaps in dfg with fxhashes (#2490)
  chore: remove duplicate span from FunctionReturnType (#2546)
  feat: Add support for brillig call stacks in runtime errors (#2549)
  feat: add `noirc_abi_wasm` crate for ABI encoding in JS (#1945)
  chore: move CRS files into their own directory (#2558)
  chore: Cleanup `rebuild.sh` script (#2470)
  chore(ci): add mocked backend binary to improve `compile_success_empty` tests (#2554)
  chore: add noir-source-resolver (#2485)
  chore: fix double verify proof (#2556)
  feat: add `nargo backend ls` and `nargo backend use` command to switch between backends (#2552)
  chore(ci): bump checkout action to v4 (#2551)
  feat: Support for optional assertion messages (#2491)
  fix: allow usage of decimal string encoding for fields larger than a `i128` (#2547)
  feat(nargo): add hidden option to produce JSON output from `nargo info` (#2542)
  chore(stdlib)!: Rename `fixed_base_scalar_mul` to be more descriptive (#2488)
  chore: Document requirement for range opcode on `r_witness` in  `GeneratedAcir::euclidean_division` (#2437)
  chore!: ACVM 0.24 (#2504)
  fix(aztec_noir): generalise loop to not always inject a hasher instance (#2529)
  chore: create helper functions for writing programs and contracts to file (#2526)
TomAFrench added a commit that referenced this pull request Sep 5, 2023
* master:
  fix(aztec): fix compilation of `aztec_library.rs` (#2567)
  feat(ssa): Replace values which have previously been constrained with simplified value (#2483)
  fix: Black box func slice handling (#2562)
  chore: Temporarily disable `noir_wasm` test (#2566)
  fix: Make def collector ordering more deterministic (#2515)
  chore: refactor `constant_folding` pass (#2533)
  chore: Cleanup mem2reg pass (#2531)
  chore: Replace hashers of hashmaps in dfg with fxhashes (#2490)
  chore: remove duplicate span from FunctionReturnType (#2546)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants